From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Mon, 13 Nov 2006 09:49:12 +0000 (+0000)
Subject: [VMX] A few small cleanups.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15551^2~14
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=ede7828af2f265d3a40abe8905611861c0f88867;p=xen.git

[VMX] A few small cleanups.
Signed-off-by: Xin Li <xin.b.li@intel.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 2eed6af1a3..3cbea986d1 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1814,7 +1814,7 @@ static inline void vmx_do_msr_read(struct cpu_user_regs *regs)
         msr_content = vcpu_vlapic(v)->apic_base_msr;
         break;
     default:
-        if (long_mode_do_msr_read(regs))
+        if ( long_mode_do_msr_read(regs) )
             return;
 
         if ( rdmsr_hypervisor_regs(regs->ecx, &eax, &edx) )
@@ -2045,11 +2045,6 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs)
 
     perfc_incra(vmexits, exit_reason);
 
-    if ( (exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT) &&
-         (exit_reason != EXIT_REASON_VMCALL) &&
-         (exit_reason != EXIT_REASON_IO_INSTRUCTION) )
-        HVM_DBG_LOG(DBG_LEVEL_0, "exit reason = %x", exit_reason);
-
     if ( exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT )
         local_irq_enable();
 
@@ -2121,8 +2116,6 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs)
 #else
         case TRAP_debug:
         {
-            void store_cpu_user_regs(struct cpu_user_regs *regs);
-
             if ( test_bit(_DOMF_debugging, &v->domain->domain_flags) )
             {
                 store_cpu_user_regs(regs);